WIP Spring cleaning #546

jarrodu · 2016-11-20T17:09:00Z

There is a lot in this pull request and I think it may be a challenge to review. It maybe easiest to review the commits one at a time. The hardest will be the _layouts commit.

Everything builds locally and no broken links are introduces.

The main motivation for doing all of this is to make the site easier to understand and modify. It is pretty much just a large refactor with a few design changes to simplify things.

I used the wayback machine to retreive a blog post. If the author really wanted this post to go away they should get it removed from the archive. We could then remove this link. For the most part I think it is best to keep it.

ashawley · 2016-11-21T15:10:04Z

_config.yml

+  events/README.md,
+  Gemfile,
+  Gemfile.lock
+  ]


Or even simpler:

exclude: - bundle-vendor/ - "*.md" - Gemfile - Gemfile.lock

*.md knocks out nearly the whole site. I get your point though. Your version is cleaner.

*.md knocks out nearly the whole site.

Sorry, it was untested.

No problem. I will update the config file with your improved style.

ashawley · 2016-11-21T16:28:57Z

download/all.md

+      {% if releaseVersion == possibleVersion %}
+        <div>
+          <a href="{{ page.url }}">{{ page.title }}</a>
+        </div>


This HTML needs to start in the first column, instead it's being shown as source code:

<div> <a href="/download/2.12.0.html">Scala 2.12.0</a> </div> <div> <a href="/download/2.12.0-RC2.html">Scala 2.12.0-RC2</a> </div> ...

Thanks for catching this. I will fix it. 👍

SethTisue · 2016-11-21T16:35:06Z

Are we sure that _tools/redirections.txt is unused? Maybe @fsalvi uses it?

jarrodu · 2016-11-21T16:39:46Z

I am not sure if it is still in use. I was going on the last modification date and taking a guess. At least it does not seem to be needed by Jekyll.

SethTisue · 2016-11-21T16:40:58Z

I don't know the templating stuff well enough to give a good technical review on that. But, other than my question about redirections.txt (hopefully Fabien will respond), LGTM.

SethTisue · 2016-11-21T16:42:03Z

Oh, now when I building I see:

[2016-11-21 08:38:52] ERROR `/webscripts/ajax/getFromTwitter.php' not found.

I don't recall seeing that error before.

jarrodu · 2016-11-21T16:45:03Z

We can always role back a few commits if need be if the templates break something.

I think the /webscripts/ajax/... and a few other things are sitting on the production server. It would be great to get everything in one place. The last few steps from building the site and getting to production are still a bit mysterious to me. I am interested in learning more though.

fsalvi · 2016-11-21T17:04:54Z

About the building error, I guess it's because of the last modification I made:
3657212

I just fixed it.

fsalvi · 2016-11-21T17:15:53Z

I couldn't see any script using _tools/redirections.txt to automatically update .htaccess
I guess it was used at first to not forget some important redirections... But afaik, it's not used anymore.

fsalvi · 2016-11-21T17:19:55Z

getFromTwitter.php is in a private repository on github because it contains keys and secrets for the API calls

Use JavaScript from https://publish.twitter.com/ Parameter reference is https://dev.twitter.com/web/embedded-timelines/parameters

Fix twitter feed on home page. closes #518

Configure width of Twitter widget to 520 pixels

Fix #548 too big Twitter feed

Fix some more broken links

Fail Travis builds if Jekyll outputs empty files

into spring-cleaning

jarrodu · 2016-11-22T07:48:28Z

I rebased onto master. I guess I still have some things to learn. A ton of commits were added to this PR. The only changes I made are the last two.

jarrodu · 2016-11-22T07:52:34Z

I am not sure what to do. It looks like merging this in may put a lot of redundant commits into the commit log. Does anyone know how to deal this this situation? I will do some more research and try to fix it.

jarrodu · 2016-11-22T08:12:32Z

Okay I think the easiest thing to do was to just make a new branch and get rid of the rebase and the weird merge.

See #550

ashawley · 2016-11-22T11:55:17Z

Looks like your new commits are at the top, so it should be easy. Something like this could fix it (where the remote jarrodwb for me is likely origin for you):

# original commit was 34f2333, but use the 3 commits from the diverged branch:
git rebase --onto 34f2333 spring-cleaning~3 spring-cleaning
git checkout master
git pull upstream master
git checkout -
git rebase master
git diff jarrodwb/spring-cleaning
git push -f jarrodwb spring-cleaning

There's no output on the last line, so you can effectively push up changes and know you are only fixing the version history but nothing else.

jarrodu · 2016-11-22T12:06:45Z

Thanks Aaron for the information. It looks like that may work. I already moved things over to #550.

jarrodu added 9 commits November 20, 2016 09:38

fix broken links in blog posts.

ad4258a

I used the wayback machine to retreive a blog post. If the author really wanted this post to go away they should get it removed from the archive. We could then remove this link. For the most part I think it is best to keep it.

fix links for Google Summer of Code

63e67bf

fix miscellaneous links

37b7c81

take liberal actions to fix old release notes links

b364385

move event to proper directory

a1c6309

remove old and unused files

547aac5

keep some files from being copied to _site directory

8bd1356

simplify _layouts and add sidebar to a few pages

94f073e

potentially controversial change. Add sidebar to documentation page

34f2333

ashawley reviewed Nov 21, 2016

View reviewed changes

Put back absolute url, but with https

9e06682

ashawley and others added 4 commits November 21, 2016 13:48

Fix twitter feed on home page

09996de

Use JavaScript from https://publish.twitter.com/ Parameter reference is https://dev.twitter.com/web/embedded-timelines/parameters

Remove references to tweetMachine

b362bde

Remove tweetMachine.js from vendor

09c5e97

Merge pull request #547 from ashawley/fix-518-tweets

91a1242

Fix twitter feed on home page. closes #518

jarrodu changed the title ~~Spring cleaning~~ WIP Spring cleaning Nov 21, 2016

jarrodu self-assigned this Nov 21, 2016

ashawley added 4 commits November 21, 2016 16:17

Fail Travis builds if Jekyll outputs empty files

20cf110

Ignore paths when checking for empty Jekyll output

0b98cd2

Fix #548 too big Twitter feed

0904a8a

Configure width of Twitter widget to 520 pixels

Remove reference to tweetMachine

f3aa7ae

sjrd and others added 12 commits November 21, 2016 22:57

Merge pull request #549 from ashawley/fix-548-smaller-twitter-feed

fe65a9a

Fix #548 too big Twitter feed

Merge pull request #544 from jarrodwb/broken-links

f9310b9

Fix some more broken links

Merge pull request #538 from ashawley/jekyll-empty-files

eee87f1

Fail Travis builds if Jekyll outputs empty files

move event to proper directory

3748950

remove old and unused files

ac7c330

keep some files from being copied to _site directory

12258ae

simplify _layouts and add sidebar to a few pages

68e7f6e

potentially controversial change. Add sidebar to documentation page

7143d50

Merge branch 'spring-cleaning' of https://github.com/jarrodwb/scala-lang

6a53230

into spring-cleaning

update array style in config file

ed04977

update array style in config file

0f00242

get rid of indents to fix Jekyll template

2cabb4f

jarrodu mentioned this pull request Nov 22, 2016

Better spring cleaning #550

Merged

jarrodu closed this Nov 22, 2016

WIP Spring cleaning #546

WIP Spring cleaning #546

Uh oh!

Conversation

jarrodu commented Nov 20, 2016

Uh oh!

ashawley Nov 21, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jarrodu Nov 21, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ashawley Nov 21, 2016

Choose a reason for hiding this comment

Uh oh!

jarrodu Nov 21, 2016

Choose a reason for hiding this comment

Uh oh!

ashawley Nov 21, 2016

Choose a reason for hiding this comment

Uh oh!

jarrodu Nov 21, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SethTisue commented Nov 21, 2016

Uh oh!

jarrodu commented Nov 21, 2016

Uh oh!

SethTisue commented Nov 21, 2016

Uh oh!

SethTisue commented Nov 21, 2016

Uh oh!

jarrodu commented Nov 21, 2016

Uh oh!

fsalvi commented Nov 21, 2016

Uh oh!

fsalvi commented Nov 21, 2016

Uh oh!

fsalvi commented Nov 21, 2016

Uh oh!

jarrodu commented Nov 22, 2016

Uh oh!

jarrodu commented Nov 22, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jarrodu commented Nov 22, 2016

Uh oh!

ashawley commented Nov 22, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jarrodu commented Nov 22, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ashawley Nov 21, 2016 •

edited

Loading

jarrodu Nov 21, 2016 •

edited

Loading

jarrodu Nov 21, 2016 •

edited

Loading

jarrodu commented Nov 22, 2016 •

edited

Loading

ashawley commented Nov 22, 2016 •

edited

Loading